>The problem is in `onCreate()` method

Do you mean the `setUp()` method?

> Should I include this 'fix' in this pull request?

Definitely. You can add this as a separate commit. Just be sure that you don't break any other tests which already pass. From the comment that I added to that code (if I am looking at the same place you are), it looks like I put the code in that order on purpose to make sure that the database is created when the activity is started and creates its `BaseballCardSQLHelper` object. I think we might have a chicken-and-egg problem here. The activity needs the data in the database before being started, but in order to put the data into the database, the database must be created to begin with. My solution to the last part was to have the activity create the database. It seems that this might not be the best solution.