Updated testsuite due to changes in features