Nick O: Fixing up failing tests