Filters in controller
Unit tests update