updated test, updated ShivaObjectParser class