#48 fix test and validation