Adding more tests

![screen shot 2014-06-15 at 22 51 53](https://cloud.githubusercontent.com/assets/520376/3283595/700ad59c-f51a-11e3-9a69-109e71a083e6.png)