1. adjust general unit tests