cleanup tests, missing modules

Cleanup tests.