Refactored tests from yesterday and attempted to resolve points of failure in other unit-tests.