rename tests
add trailingslash matcher to expression
Cleanup tests for Issue 1077