Adding initial batch tests