compact mode - fixing unit tests