Cleaned up unit tests

Wanted to get back to the point that the tests were running and not erroring.