Switch swap tests to lightweight_test.
Merge branch 'develop'