Add test command and changed class names