ReAdded tests that were lost
Update
Update
Fixed Merge