Kevin kt6683 and Pratik pratik47 unit and acceptance tests