Moved test command into it's own class