Trying to fixing falling tests