Now supporting concrete kwargs
Cleaned up the tests and discovered some missing or ambiguous behavior