reactivate three remaining tests and fixes code accordingly