Merge pull request #352 from shatterednirvana/master

Fixed broken unit tests