Simplification of the code in TestYaka.
Better simplification of TestYaka.