Change handling of Fleet Captains

The previous approach didn't quite work and its easier if the platforms match.

Got rid of officer test squad until they are implemented on Android.