Fixing Tests Problems