Add system tests and fix console tests