Add: Makefile, test.cc; Fix: Minor fixes