changing the test format for cleaner code, and faster tests