Separated test entities from test app; removed TestBundle