Fix tests

Git log is clean, look there for a list of things that were done. Basically, this is a massive cleanup.