Merge branch 'feature/tdd' into feature/postgres
Fixed test cases
Merge branch 'feature/postgres' into feature/postgre_tdd