Add tests, rollback unnecessary change