linting + tweaks

 * removed a failing test - it only fails in py3.3 because
 mock doesn't seem to patch correctly :S