Lots of fixes
Fix up coverage and build status tests