Fixed algorithm to fully expand to container size
Fixed acceptance_test