some cleanups
Merge branch 'cleanup/tests'