Minor fixes, updated tests
renaming