Made tests smarter