Tests now work with 1.8.7