Added class builder and unit tests for it