removed warning
fixed simplify tests