#814 Description Builder: Added test and sample classes