Refactored tests, close #68