Fixed tests which were broken