Refactoring: Return instance of Barcoder
Fix: Make tests work again