Updating tests to reflect various changes introduced since 2013.