reviving unit tests