fixed and improved tests
rename and bugfixes