further loading, testing, and coverage cleanup