cleaned up testing stuff