add support for bbox
optimized tests