Got rid of all conditional statements in tests