Reverting back all changes and test