Remove prelim .match test; replace with less specific tests
Restructure tests to be held in a describe block