Merge pull request #4 from ivan-shaporov/dev

Pull from George. Fix unit tests.
More unit tests.