View Tests Preparation

Further refactoring is required