updated tests, removed obsolete tests
code cleanup
updated tests