[#6] PR comments except new test