Removed unused code.
Fixed a test that tested changed code.
Added a test for the bounding box.