removed obsolete tests and made stylistic changes