Refactored and simplified tests, removed non-necessary code.