cleaned up unit tests so all pass.