Migrated to jUnit4 syntax