continued with sample, some changes on unit tests