Adds facade, builder and new tests