added parsing and updated testing files
added parsing and updated testing files