fix formating and tests