Tests now work well