Minor changes to UnitTests

![image](https://cloud.githubusercontent.com/assets/656739/5493964/6d43eea2-86e7-11e4-9fcf-d85278039ca4.png)