repaired existing unit tests