Another test fix following move/rename of plugins