Merged changes from AFRL SORCER - fixing modeling tests - work in progress