Merge Kate's revisions: Show page & Controller tests