Work on refactoring rspec-system tests - not run yet - WIP