Adding text field, removed some tests