removed test/ dir before merge