Fixed initial-view support
Created tests for view change