Feature #64, implementing test