removed obsolete tests
added missing include