merged jwang's initial tests