Added test model, and working on better API