Made test run with current version of code