Add additional unit tests for bulk method

Add more complex unit tests and begin work on improving the algorithm
to deal with cases where the boundary layer intersects within a layer.