Cleanup tests
Fix samples and caption issue