Remove more syntax from tests