Removed batch trigger
Added test