improved tests, added brute-force-leak-check