added friendly/hostile field control
updated test to fit new schema