adding tests & parsing