Simplify tests part 2