Better tests, yellowish color for matches code refactoring.