Added parser namespace.
Updated tests and checked if they were still working.