Some more tests prettied