Fixing tests...not yet done