Add tests locally so can run while not online.
Rename file
Refactoring based on unit tests.