Brush up some tests