Added more tests and link some files. Update DB Scheme