Committing fixes for broken tests