unit tests corrections