Functional tests rewritten to incorporate redesign