Finish implement and simple test