Add some tests expected to pass.
Add some failing tests for the future.
Merge branch 'enhance_testing'