Test refactor, using SimpleUnit