Added tests + entity relation diagrams