Rewrite performs_within to work with v8.2 and up
Properly escape plus character in tests