Fixed work with controllers and adde tests