More tests, getting ready to replace old parser