Added additional test builders for various classes and changed some
existing unit tests to use these test builders.