re: 493 add tests