Bump to appengine 1.8.3
Minor test structure changes