test compile fixes

- for ubuntu 13.04 - gcc 4.7.3
- john did the fixes, so must be good!