Add some advanced tasks and start on choices/liverservertestcase bit