Code coverage increase

Nearing 80% again, there is also some dead code that needs to have something done with it.