cleaned up testing