Adding cleaner and more flexible unit test validation.