fixed broken unit tests
Merge pull request #360 from shatterednirvana/fixed-unit-tests

fixed broken unit tests