Fixed broken tests
Merge pull request #19 from colinwren/master

Fixed broken tests