Enhance tests a bit