added functional testing (again)