added fixes for failing tests