Updated tests to match the functionality that was merged in.