FIX: Fix unit passing

@drammock ready for merge