Update unit tests, work on PDF issue