SimpleUnit, test refactor