Added serial number to tests, fixed FR glitch