Worked further on functional tests.