Benchmark tests and bug fixes

- Testing some benchmark warrior from a mature MARS simulator
- Bug fixes derived from fixing the tests