added more test, changed some fields