moved tests; fixed container equals check