Updated high level tests