Test refactored to use simpleunit