Update badges
Refactor test
Fix up source code