More search-specific specs to search spec and add it to the test script
Attempt to make some action composition methods less hairy-looking using type aliases