updated sample database, improved relationship testing