Make some code more readable, reduce also frequency as bad test edge cases