Fixed system tests