CDB-1306: More tests added + test batteries added to makefile