reinstate subviews.hpp and its tests