bug1019528 - adding more tests, and going with simpler set method