More tests
Merge branch 'laboratory'