Patch 7.2

Bugfix
Some test features