Renamed and added code for unit test + class lib project