fixed some tests
Merge branch 'JESSEaddFeatures'