Implement tests for US#06
Fix code for US#06