gwt tests and logic updated