tests for one model and one controller
follow and unfoloww methods
some fixes after conflict
fix conflicts