Updating tests to pass