cleaned up unit tests
cleaned up unit tests