small fixes, 4110 unit tests working