Adds more intelligent tests