Added database class and test scenario