cleaned up tests, removed some deprecation warnings