Moving orders show views to more reasonable places and adding tests