Add test deps and some cleanup
Add test deps and some cleanup

Review: https://rb.mesosphe.re/r/103

EasonYi/marathon,ss75710541/marathon,bobrik/marathon,Yhgenomics/marathon,murat-lacework/marathon,sielaq/marathon,spacejam/marathon,14Zen/marathon,drewrobb/marathon,quamilek/marathon,sledigabel/marathon,HardikDR/marathon,janisz/marathon,14Zen/marathon,lelezi/marathon,spacejam/marathon,mikejihbe/marathon,gsantovena/marathon,lelezi/marathon,bobrik/marathon,meln1k/marathon,hangyan/marathon,guenter/marathon,natemurthy/marathon,cherrydocker/marathon-1,mikejihbe/marathon,manojlds/marathon,matsluni/marathon,mesosphere/marathon,Caerostris/marathon,airbnb/marathon,timcharper/marathon,vivekjuneja/marathon,Caerostris/marathon,matsluni/marathon,murat-lacework/marathon,gsantovena/marathon,HardikDR/marathon,airbnb/marathon,drewrobb/marathon,SivagnanamCiena/marathon,janisz/marathon,hangyan/marathon,meln1k/marathon,ramitsurana/marathon,Yhgenomics/marathon,cherrydocker/marathon-1,felixb/marathon,ayouwei/marathon,Kosta-Github/marathon,timcharper/marathon,rtward/marathon,sledigabel/marathon,HardikDR/marathon,EvanKrall/marathon,lelezi/marathon,MiLk/marathon,mesosphere/marathon,rtward/marathon,sepiroth887/marathon,SivagnanamCiena/marathon,sttts/marathon,ramitsurana/marathon,ss75710541/marathon,c089/marathon,meln1k/marathon,meln1k/marathon,sttts/marathon,ayouwei/marathon,ramitsurana/marathon,Caerostris/marathon,guenter/marathon,airbnb/marathon,spacejam/marathon,airbnb/marathon,janisz/marathon,manojlds/marathon,IanSaunders/marathon,sielaq/marathon,Caerostris/marathon,guenter/marathon,yp-engineering/marathon,spacejam/marathon,bobrik/marathon,sttts/marathon,pgkelley4/marathon,mesosphere/marathon,vivekjuneja/marathon,c089/marathon,MrMarvin/marathon,sledigabel/marathon,quamilek/marathon,sepiroth887/marathon,14Zen/marathon,sielaq/marathon,hangyan/marathon,EvanKrall/marathon,okuryu/marathon,guenter/marathon,bobrik/marathon,rtward/marathon,gsantovena/marathon,IanSaunders/marathon,c089/marathon,quamilek/marathon,pgkelley4/marathon,gsantovena/marathon,cgvarela/marathon,ss75710541/marathon,natemurthy/marathon,felixb/marathon,EvanKrall/marathon,felixb/marathon,natemurthy/marathon,murat-lacework/marathon,EvanKrall/marathon,vivekjuneja/marathon,gsantovena/marathon,mikejihbe/marathon,SivagnanamCiena/marathon,EasonYi/marathon,mesosphere/marathon,timcharper/marathon,IanSaunders/marathon,MrMarvin/marathon,meln1k/marathon,sepiroth887/marathon,mesosphere/marathon,drewrobb/marathon,pugna0/marathon,cgvarela/marathon,Kosta-Github/marathon,c089/marathon,Caerostris/marathon,cherrydocker/marathon-1,manojlds/marathon,felixb/marathon,Yhgenomics/marathon,bsideup/marathon,sielaq/marathon,bsideup/marathon,ayouwei/marathon,EasonYi/marathon,pugna0/marathon,janisz/marathon,okuryu/marathon,bsideup/marathon,titosand/marathon,janisz/marathon,matsluni/marathon,titosand/marathon,guenter/marathon,MrMarvin/marathon,MiLk/marathon,drewrobb/marathon,pugna0/marathon,yp-engineering/marathon,14Zen/marathon,okuryu/marathon,MiLk/marathon,cgvarela/marathon,sttts/marathon