Aver

Fixed brocken sample and set up unit tests