Starting to wrap more stuff in tests.