More tests
Updates comments
Addressing review comments