start adding tests to t
some cleanups
cleaner outline of test