Worked on mocking-with-rspec checkpoint
Cleaned up modified files to resolve current index first