Tweak
Restore 404 spec

Turns out the 'fix' only worked if that test was run standalone, not as part of a suite.
Post: 'UNION with Active Record'