More tests, add simulation mode