format tests and add more exports