Added code to pass plugins tests