Refactor + linted
Remove old tests - linter now 100% passing