Removed legacy testing code