fix some stuff for testing