Added makefiles and some tests for them