Use the new framework for more samples
Removed all tests