kill simple_* and update tests