tweaking tests and whatnot