Write some tests for #36
Merge branch 'master' of github.com:SWTI2014/SWTI2014-Project-03