Update on the class. Edited tests and samples.