Added system testing