Unit tests and name cleanup