updated tests - now they *really* work