Update make test to include func. tests