Split into library and test