renamed file
removed some parsing rules that weren't used
shuffled a bit the tests