Removed extra code from testing