speed improvements on some tests + discussion models and tests