Expanded unit tests

Added new unit tests; cleaned up unit tests.