Improved testing for 2.b