Issue #426 - fixed broken tests
Merge pull request #428 from nwinklareth/v2.0-dev

Issue #426 - fixed broken tests