Simplified code and additional test for axis-joint behaviour