Working on skeleton command and tests