Implement tests for US#01
Fix code for US#01