Lay groundwork for more thorough functional tests