Made build,tests apptest working again