numerous changes to tests, small fixes in parse and convert methods