ok....fixed up...unfortunately these are really not testable as they are legacy code related (could be done, but not easy)