Stuart Douglas
committed
on 27 Jul 10
update tests and NPE fix