changed unit tests to bring into compliance