Fix tests

Tests are now all passing