Patch fix for failing tests, all tests passing