Refactored all test(s)