Make updates to new Android2HTML tests