fixes test integration issues