Redid tests, add the (hopefully) last few fixtures
Tests for parser