Changed tests back to their original setup, waiting on a fix for the test