Update tests to use FXApom