More tests for empty and "none" cases