rspec script updated, db structure updated