work on database classes + tests