Fix failing tests.
Merge pull request #2 from valchonedelchev/master

Fix for failing tests.