cut long lines
added another bunch of high level tests