first controller and test
merge