REFACTOR REDUNDAT TESTS