Refactored the tests and fixed some issues