New branch

solid tests.