added test level
fixed merge conflict