Revert changes leaving tests to prove that it works