New samples and unit tests