Cleaned things up. Unit tests are now functional.