Start on tests; updated the DB schema