Minor test clean ups