Added library and test