Bug fixes from silly mistakes
Testing infra
Version bump for previous fixes
Added initial tests - <50% coverage for now