Refactor tests to use simpleunit