Renamed stuff and added test coverage metrics
Whoops.