Fix assorted tests