marked tests pending. adjusted a few tests based on chat w/ freddyb