Accommodated various tests.