Fixing tests to work with version 2.0.0