Fixed unit tests! Yay! Also some PEP 8ification.
Small bits of cleanup. Revert database to basis, PEP 8 adherence, removed a print line meant for testing.