Generic Tests Bugfix