Fixing the test, making the change as per #116 and another small change I not...