(JAL-969) todo test re refactoring and possible change in semantics