get unit tests working with new style