a bit code formating, new tests added