[master] const problems
[master] test fixes