Made tests a bit more organized and clear