Made tests a bit cleaner