Refactoring of Unit Specs

Parts of the unit spec suite are really old. I see that I learned a lot from back then. This should bring everything up to speed.