Various improvements to read test controller and update test controller. Removed some safe handle exceptions that could be handled nicer.
Re-added a safe handle exception since it was necessary after all
Removed unnecessary safe handle exception (which was already commented out)