Update Views and Add a Test Based on PR