Add test configurations and repair erroneus