restored unit tests
restored unit tests