fix validation in definition & remove test code