Added some more tests and real behaviour to parser