updated tests to work with latest changes