Modified the functional test