Two unit tests pass now