Bringing tests up to date with current changes