Test refactor, to use simpleunit