Add unit test
Remove * from grade and CP
Add unit test