Added test.cpp to makefile
Updated to new API function names