fcm cm: restructure and delete old tests