Fixed test plugin warnings, updated templates