We let the tests go by the wayside... let's fix them up and try to get as close to 100% coverage as we can.