And testing is complete!

Well that was certinaly entertaining. Turns out, you can't put
placeholders where variable data really shouldn't be. So all that was
updated, but hey, at least complex queries are working out now!