Remove const-qualifier from return values
Remove unused argc/argv from sample/test