FIX: Fix KIT forward solution calculation
FIX: Fix tests
FIX: Fix tests