Depend on assertJ, start to migrate tests