Fixing test methods