Added more unit tests for implemented code.