unit tests and some name changes