Adding structure for functional tests