Fix non-modular Appspot testing, better api for parsing.