Made tests not as ugly