added tests, removed obsolete tests/code
removed obsolete code
added tests