PEP 8 spacing
modified arg numbers
updated tests
updated tests