Merge "Add library test makefile solutions."