WIP updated unit tests