Updated function signatures, the parser test and added test model