restructured tests for python2.  probably need to be commented and reorganized but for now, have spent way too long on them