moved models and got simple tests working