Refactor for easier smaller methods

Add some testing to ensure we always request the right files from
static.