Simple tests pass now