Fix class use
Add test case