[#32]tests and few methods for Review