added jbuilder, builder templates, started refactoring tests