Modify tests to pass