Merge "add 2 new test plans for lab testing" into klp-dev