Changed to jUnit4