testAdded + some improvements