Add test and parser