Minor changes and missing test cases
Gra to Cst