Working on controller & some test files