First commit of system tests