Adding test and improving result parsing.