Fix up SiRF parsing and test code so that it actually works