Fixed and added batch tests