Bugfix: Test7 passes