Refactor FCP interface test slightly