uncomment rest of tests and format