Final change from int to StatusCodes. Test are working.