More tests and adjustments