remove unneeded conditional
fix tests