Updated the tests to be cleaned up methods instead of repeating myslef in code