Fixing them tests