Smoothed out the tests