Added test for completion. Fix bags