Add some more tests for FCP interface and refactor