+ fixes

Change-Id: I3f81b413b45519fa005d9426e2d2b0241e3edfc9
+ tests

Change-Id: I156c6f745c9f7557b8467fea20bd50a5d117bc49