Further work on db testing
API work