Started to factor out common test code
All the presentation specs now use common test code