Added new tests, refactored the old ones