Make it possible to run individual tests

Change-Id: I190a72113f0938046d2f41496d968b6327b7e682