Added library Data and test cases, clean up.