Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
Not sure. Probably not necessary. :)