Fix for some failing tests

Pass: 214
Fail:   4