merging app and test projects