moving stuff around, add new controller test
add new controller test