fixes for breaking tests