moving some code around to get unit tests working again.
no message