Added prepare/tearDown to controller architecture