Updated tests for 2.7