Aerogear-868

* Fixing parser error(s)
* adding tests