reorganizing test and src