Added SwapView / ViewIndicator unit and functional tests.