Checking for the right thing
Updating tests