Added system tests