Tweaks and tests
tweaks
More tweaks
Merge branch 'test-framework'
test