refactor tests
refactor controllers' tests