Clearer separation of tests and helper modules. Timing issue test #5