Fixed func. tests