FS-10 FS-12 tests and refactoring