Use the checkURL func and remove magic

Use the checkURL func and amend settings for tests + add a flow test.
Ah, ok - it's probably more flexible that way - I'll re-jig it.