iteststructure back in place

Somehow we lost the structure of the testing
environment that we had put in place. The
starting point is back in place to start to
test the controllers