Clean up tests to use it syntax