improved testing
3 files changed