Nalanda rct3 test fixes

Fixes failing tests on the Nalanda RCT3 branch.

Will merge as soon as Travis passes them. @jamalex @aronasorman @dylanjbarth let me know if you disagree.