Fixed/removed broken tests