Fixed DB and updated schema, worked some test cases
Updated DB and EDMX
updated db