Updated to use identifier
Updated test monitors