TST: Fix tests so they pass under NumPy 1.6