change test to funsuite and misc updates