Make tests more comprehensive