parser fixed once more, + moar tests