In progress work on unit tests