Added test, for integration, model and controller