Updates for testing and capistrano files