#38 enhance tests