Get tests working for Parser