fix - craft-atom-lock test
del - useless util class, has better replacement