organize tests, format code