Added datafixtures and updated the entities a bit