Fixes for the tests based on web changes.
Merge pull request #90 from alxdarksage/develop

Fixes for the tests based on web changes.