Added some more fields to the parser
Added dummy test