Cleaning up after refactoring
Tests
Lint
CI goodness