Fix tests regression // Refactor monitor