more unit tests and test descriptions