Fixed ValueHandler tests.
Fixed tests.