wrote tests and fixed the parsing done so far