Minor updates, extra tests
Minor updates, extra tests