fixed tests
added Tokenizer / Parser rewrite
added tests