Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
Please explain why you changed the above code to this one.