Update functional tests with extra assertions