Clean up : Updated Tests which was causing build failure