rename some tests
Rename some tests
some bugfixes, more unit tests coverage