System input testing added