Unit testing, close #4