fixed tests and formating