tests updated and went to GWT too