Finalise project and add Test case