fixed more testing stuff