Working on unit test support