Refinements to unit test (timing tweaks, not completely happy)