Fixing plenty of tests