Beginning refactor of tests and code