Added serializer test
Fixed minor syntax errors
Added Query.R to collate