attempt to fix smoke test build and improved solidity and debugging of #2061 test