Implement Ice Barrier, add more tests