Refactoring
Made tests a bit cleaner