made tests compilable
renamings, formatting should be faster