Tests passing on 1.3
Minor code tweaks for 1.3