updated test configuration and minor fixes