Significantly improved variation of the test