fix: Update for TDD and AddView