unit tests fixed & views fixed