unit tests need a refactoring, bc they can run individually code its making assumption that run from start to end.
