Making tests work. Cleanup.