Tests failing. changed to cs from bin
merging from lostdev
adding cs
adding ncrunch