Test refactor using simpleunit