Jeremy Test fixed

Fixed bugs from Jeremy's test