change +/- to .+/.- in tests