merged testing with controllers to master