New health pages, test tweaks, File refactor