shift test order; we need to figure out what's really going on here
Merge branch 'master' into issue43-2