BVAL-444 Reinstate tck-testable that got lost