Failing tests
Fixes previous failing tests