Go back to old non-standard case syntax
Remove sample built-in
Minor formatting
Add some more tests