Resolved several unit test failures, more 5.3.3 compat, updated tests