Fixing the single tests to run standalone.