Add numpy 1.6 compatibility change to tslib. Tidy up tests.