Use the checkURL func and remove magic

Use the checkURL func and amend settings for tests + add a flow test.
Yeah, this is a good point. If you have any ideas in how we could wrap error handling better I'd be keen to think about it. It would be nice if errors could be done centrally without needing to remember to add a return.