Viewer improvements
Added facade tests
Test refactor