Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
please add the comment above, since it's so long