More tests
Minor Adjustments