Revamped functional tests