Remove 5.3 from tests matrix
Code tweaks