Solve problem with camel/snake notation; some tests;
tags controller: begin
Merge; fix errors