Refactored all tests so far