Parser set. Test update needed to debug.
Tests updated to work with the new API