Rename base app to common
Updated test