Make test smarter