Made tests work and output cleaner.