Finish comment builder and test