Fix: Minor PEP8
Assure default value
Fix: Remove unneeded function
Fix: Remove bad test