Added:-
Changed:
1) Test files merging in tests folder
2) DataBase.php error handling implemented