Finalized changes for component finding
Added tests for Queue
More work on BDS