Test fix

In the current version the tests do not pass. This pull request fixes this.