Getting unit tests into shape