added testing
fixed merge