tiding up unit tests