Reverted changes and test for live