removed old test class from import
fixing -feature and -deprecation warnings