Removed tests for refactoring later