Patched live test and gathering error codes, added todos