Start to fix junit...