Fixed/Updated/Removed tests