make tests a little less javay