Adding subtest model and DOA