Improving testing and set 5.4 as min requirement