More tests for review and merge