fixes and unit test progress