Fixing some tests; they weren't returning the proper results.