Test fix

Tests are all now passing locally