Tests cleanups
3 files changed