Fixes to test changes

Add back assert for overlap
Fix snap size and remove unnecessary comments
Disable failing test cases that need to be debugged

Signed-off-by: David Zafman <david.zafman@inktank.com>