Updating tests for changed definitions