updated tests to support 2.6