Uncomment testSomeMustNone and make changes to get it passing