Added more coverage. Updated makefile.