Simplify some lines and rename a test to be more explicit