fix up tests and /