Updated tests to be consistent with current code