Cleanup
Added BeEmpty
Added Contain