Fixed build error in test
Merge branch 'laboratory'