More RSpec refactoring, add pry, ERD