Replace Test code to better reflect real useage!