Refactor to use simpleunit