1st pass at cleanup of unit tests; a couple of nitpicks from SLInsights