reorganizing unit tests