Update jswars and incorporate TestQueue into tests