Getting in Missing Extension Method, Improving Tests

Related to Issues #381 and #508.