enhance tests a bit