Cleaned up some old testing stuff