start writing some tests, tweak parsing method