Fixed and inserted meaningful tests. Commented out a bunch of tests because they'll take a long time to fix and already have some coverage.