Tests adjusted
5 files changed