uncomment tests, remove unnecessary dependencies