Refactoring: removed most tests