Updated test cases, and ran most recent tests to success.