more tests + cleanups