added some flexibility for python version <2.7.3, tightened up Magellan test