Cleanup
Undefined partial
Expand testcases