re-add support for multi-valued attributes

Add tests for ensure re-add support for multi-valued attributes is working