1) Added Tests
2) Fixed bugs
3) Started to add real data to the database initiazier