removed appengine dependency and updated tests.