Removed system-generated tests to write new ones