test: cleanup & tweak test
2 files changed