tests run again (probably merge errors...)