Remove functional test duplication