Moving the healthcheck registration part.

It passes more tests when its here :(
Ignoring a pile of tests that are failing

These are all commented with TODOs because they should be fixed, but
it's not the primary problem right now