Fixed Broken Tests