100% code coverage
Added 5.6
Replaced self with static