A few more tests...
Minor clean ups...