Added ViewDefinitionBuilder and test