**Description** <!-- Please describe shortly your feature idea. --> Clean up tests to match our standards **Use case or motivation behind the feature request** <!-- Please tell us what you would like to happen. Rather than explaining the implementation process, we would appreciate to hear what you are trying to achieve with your feature. --> There are a lot of branching and try/catches, non-standard domains, while loops and such, should avoid them if possible