More tests and improvements for scram