Smarter test