Added tests & parser.scala