Created builder classes and builder test classes