Cleaning up some code
Added tests for deploy:index command