Optimized tests a little bit