Builtins fix for 2 and 3, tests aswell
Merge branch 'master' into pr/208
tell flake8 to shut up