Started on unit test optimizations