Set up new tests
More tests, some refactoring.
Cleaned up consts.
Clean up internals.
One line pragmas.
Merge branch 'feature/separate_selectors_for_tests' into develop