Test refactor
- Removed bats, replaced with aruba
- Covered most common case uses