Improve/fix boundaries tests