updated several Tests and fixed all remaining testing errors