Tests refactor to use simpleunit