Fixed everything you noted

For some reason, all the tests pass when you run the suites separately, but they don't when you run them together. I've been working on it for a little while now and can't figure it out.