improve Test to be less dependent on java.lang for testing composite types