Reduced visibility of implementations
Initial unit tests.