fix warnings
compatibility with meck 0.8.1
Remove unused test function
Fix comment styles and indentation.