Follow Up of issue #21, this fixes the tests