Cleanup/streamline tests.