fixes for failing tests