Port Database_Books plus unittests