WLS: updated top-level and unit types after finding problems with failing test cases.