Fixing tests.
Adding parser functionality.