Added app model and test set ups