Updated DB scheme

Added test data