Refactored the test and added them to the test suite