Format clean up and add test sources to build