Redid unit tests