More adjustments, added some test hints