Attempt to fix never-ending tests