Fix tests which are no longer running.
Merge pull request #94 from adorokhine/test

Fix tests which are no longer running.