Make the test data immutable
Fix some parsing issues