cleanups
more tests + cleanups