Re-Added all tests