Fixed unit tests and deleted old/unimportant ones.
Cleaned up the unit tests.