Fixing tests and bug introduced in previous commit