Attempting to fix failing tests