Rebase to Master

 - Moved the db migration step to 005 to avoid conflict with recent
   merge.
 - Added test spec