Added some output system and a system test