Fixing broken unit tests. Resolves issue #4.