Added Tests and Parser