cleaned up some tests and some styling mods