Fixed the test, but really need to address the root cause