[Issue 090714000] Testing that nothing has been broken + add support for
last remaining requirements