Minor bug fix
Added/modified examples to increase coverage
Minor change to fail asap