Remove redundant unit tests
Extend lexer and parser with function definition