Merge "Fixed an issue with a test that didn't work properly"