Updating tests so that they are passing.