fix formats to pass optional tests
add optional tests