Fix model test -- barriers added and buttons changed