added parsing and updated testing files